From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 28 Mar 2016 21:56:13 +0000 (-0400)
Subject: Move autotestkeywords to testsuite
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~2247
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=6f2d5a62909191052462ea4abe69f194ff140a2a;p=gtk%2B3.0.git

Move autotestkeywords to testsuite

All the 'make check' and installed tests are now in testsuite/,
and tests/ is just a collection manual test programs.
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 681807d71c..aeb51a6ca4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -178,22 +178,6 @@ if USE_X11
 noinst_PROGRAMS += testerrors
 endif
 
-if HAVE_CXX
-
-AM_CXXFLAGS = $(AM_CPPFLAGS)
-
-noinst_PROGRAMS += autotestkeywords
-TESTS = autotestkeywords
-
-autotestkeywords_SOURCES = autotestkeywords.cc
-autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers
-
-if HAVE_OBJC
-autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++
-endif
-
-endif
-
 animated_resizing_DEPENDENCIES = $(TEST_DEPS)
 animated_revealing_DEPENDENCIES = $(TEST_DEPS)
 flicker_DEPENDENCIES = $(TEST_DEPS)
@@ -582,9 +566,4 @@ EXTRA_DIST += 			\
 	popover.ui		\
 	selectionmode.ui
 
-CLEANFILES = 			\
-	autotestkeywords.log	\
-	autotestkeywords.trs	\
-	test-suite.log
-
 -include $(top_srcdir)/git.mk
diff --git a/tests/autotestkeywords.cc b/tests/autotestkeywords.cc
deleted file mode 100644
index 28b1d24bac..0000000000
--- a/tests/autotestkeywords.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <gtk/gtk.h>
-
-#ifdef GDK_WINDOWING_DIRECTFB
-#define gdk_display gdk_display_directfb
-#include <gdk/directfb/gdkdirectfb.h>
-#undef gdk_display
-#undef GDK_DISPLAY
-#undef GDK_ROOT_WINDOW
-#endif
-
-#ifdef GDK_WINDOWING_QUARTZ
-#if HAVE_OBJC
-#define gdk_display gdk_display_quartz
-#include <gdk/quartz/gdkquartz.h>
-#undef gdk_display
-#undef GDK_DISPLAY
-#undef GDK_ROOT_WINDOW
-#endif
-#endif
-
-#ifndef __OBJC__
-#ifdef GDK_WINDOWING_WIN32
-#define gdk_display gdk_display_win32
-#include <gdk/win32/gdkwin32.h>
-#undef gdk_display
-#undef GDK_DISPLAY
-#undef GDK_ROOT_WINDOW
-#endif
-#endif
-
-#ifdef GDK_WINDOWING_X11
-#define gdk_display gdk_display_x11
-#include <gdk/x11/gdkx.h>
-#undef gdk_display
-#undef GDK_DISPLAY
-#undef GDK_ROOT_WINDOW
-#endif
-
-int main() { return 0; }
diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 5fc1cf167d..a0aa944292 100644
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -80,6 +80,21 @@ if OS_UNIX
 #TEST_PROGS			+= defaultvalue
 endif
 
+if HAVE_CXX
+
+AM_CXXFLAGS = $(AM_CPPFLAGS)
+
+TEST_PROGS += autotestkeywords
+
+autotestkeywords_SOURCES = autotestkeywords.cc
+autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers
+
+if HAVE_OBJC
+autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++
+endif
+
+endif
+
 treemodel_SOURCES = 		\
 	treemodel.h 		\
 	treemodel.c 		\
diff --git a/testsuite/gtk/autotestkeywords.cc b/testsuite/gtk/autotestkeywords.cc
new file mode 100644
index 0000000000..28b1d24bac
--- /dev/null
+++ b/testsuite/gtk/autotestkeywords.cc
@@ -0,0 +1,39 @@
+#include <gtk/gtk.h>
+
+#ifdef GDK_WINDOWING_DIRECTFB
+#define gdk_display gdk_display_directfb
+#include <gdk/directfb/gdkdirectfb.h>
+#undef gdk_display
+#undef GDK_DISPLAY
+#undef GDK_ROOT_WINDOW
+#endif
+
+#ifdef GDK_WINDOWING_QUARTZ
+#if HAVE_OBJC
+#define gdk_display gdk_display_quartz
+#include <gdk/quartz/gdkquartz.h>
+#undef gdk_display
+#undef GDK_DISPLAY
+#undef GDK_ROOT_WINDOW
+#endif
+#endif
+
+#ifndef __OBJC__
+#ifdef GDK_WINDOWING_WIN32
+#define gdk_display gdk_display_win32
+#include <gdk/win32/gdkwin32.h>
+#undef gdk_display
+#undef GDK_DISPLAY
+#undef GDK_ROOT_WINDOW
+#endif
+#endif
+
+#ifdef GDK_WINDOWING_X11
+#define gdk_display gdk_display_x11
+#include <gdk/x11/gdkx.h>
+#undef gdk_display
+#undef GDK_DISPLAY
+#undef GDK_ROOT_WINDOW
+#endif
+
+int main() { return 0; }